Auto merge of #2979 - jonathandturner:prepare_for_new_format, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 9 Aug 2016 16:25:54 +0000 (09:25 -0700)
committerGitHub <noreply@github.com>
Tue, 9 Aug 2016 16:25:54 +0000 (09:25 -0700)
commit2d85908217f99a30aa5f68e05a8980704bb71fad
tree263f32e4dffdf649e1479161296ebcabcfdf2253
parente95828103a1d8be1161adf394434b18e2e708954
parent7e10fad6a51863af2214c69a7abd6823ad8b8cbc
Auto merge of #2979 - jonathandturner:prepare_for_new_format, r=alexcrichton

Update cargo tests in prep for new errors

This updates a couple tests so that we can upgrade rustc to new error format.

r? @alexcrichton